Merge
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Tue, 3 Jan 2006 16:19:20 +0000 (10:19 -0600)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Tue, 3 Jan 2006 16:19:20 +0000 (10:19 -0600)
1  2 
xen/arch/ia64/xen/domain.c

Simple merge